Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 3 Jul 2010 11:08:43 +0000 (11:08 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 3 Jul 2010 11:08:43 +0000 (11:08 +0000)

Trivial merge